gtk/gtkstyle.c (_gtk_style_peek_property_value) Amend previous change to

* gtk/gtkstyle.c (_gtk_style_peek_property_value)
Amend previous change to avoid runtime error in g_param_spec_ref()

diff --git a/ChangeLog b/ChangeLog
index f2920f5c41e0b3bebf7ff4197267cfb5c6a73383..37dc4773906142d74df51df8caef72061a32a819 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkstyle.c (_gtk_style_peek_property_value)
+       Amend previous change to avoid runtime error in g_param_spec_ref()
+
 Mon Sep 10 06:58:56 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (insert_rc_property): Fix blank line

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f2920f5c41e0b3bebf7ff4197267cfb5c6a73383..37dc4773906142d74df51df8caef72061a32a819 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkstyle.c (_gtk_style_peek_property_value)
+       Amend previous change to avoid runtime error in g_param_spec_ref()
+
 Mon Sep 10 06:58:56 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (insert_rc_property): Fix blank line

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f2920f5c41e0b3bebf7ff4197267cfb5c6a73383..37dc4773906142d74df51df8caef72061a32a819 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkstyle.c (_gtk_style_peek_property_value)
+       Amend previous change to avoid runtime error in g_param_spec_ref()
+
 Mon Sep 10 06:58:56 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (insert_rc_property): Fix blank line

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f2920f5c41e0b3bebf7ff4197267cfb5c6a73383..37dc4773906142d74df51df8caef72061a32a819 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkstyle.c (_gtk_style_peek_property_value)
+       Amend previous change to avoid runtime error in g_param_spec_ref()
+
 Mon Sep 10 06:58:56 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (insert_rc_property): Fix blank line

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f2920f5c41e0b3bebf7ff4197267cfb5c6a73383..37dc4773906142d74df51df8caef72061a32a819 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkstyle.c (_gtk_style_peek_property_value)
+       Amend previous change to avoid runtime error in g_param_spec_ref()
+
 Mon Sep 10 06:58:56 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (insert_rc_property): Fix blank line

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f2920f5c41e0b3bebf7ff4197267cfb5c6a73383..37dc4773906142d74df51df8caef72061a32a819 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkstyle.c (_gtk_style_peek_property_value)
+       Amend previous change to avoid runtime error in g_param_spec_ref()
+
 Mon Sep 10 06:58:56 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (insert_rc_property): Fix blank line

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f2920f5c41e0b3bebf7ff4197267cfb5c6a73383..37dc4773906142d74df51df8caef72061a32a819 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkstyle.c (_gtk_style_peek_property_value)
+       Amend previous change to avoid runtime error in g_param_spec_ref()
+
 Mon Sep 10 06:58:56 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (insert_rc_property): Fix blank line

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 8c90bf89b65f7e00ade87845f93362f26a195256..18040214d01c5582727ad707c16d74493ede25b2 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -1300,13 +1300,14 @@ _gtk_style_peek_property_value (GtkStyle           *style,
   g_return_val_if_fail (g_type_is_a (pspec->owner_type, GTK_TYPE_WIDGET), NULL);
   g_return_val_if_fail (g_type_is_a (widget_type, pspec->owner_type), NULL);
 
+  key.widget_type = widget_type;
+  key.pspec = pspec;
+
   /* need value cache array */
   if (!style->property_cache)
     style->property_cache = g_array_new (FALSE, FALSE, sizeof (PropertyValue));
   else
     {
-      key.widget_type = widget_type;
-      key.pspec = pspec;
       pcache = bsearch (&key,
                        style->property_cache->data, style->property_cache->len,
                        sizeof (PropertyValue), style_property_values_cmp);